AutoUpload improvements by mario · Pull Request #1468 · nextcloud/android

mario · 2017-08-31T10:28:50Z

This should fix two issues:

resolves Auto Upload: uploads 0b files #1295
And one where uploads are not started on boot (still strange, but this is a workaround which might help).

Wasn't tested since I can't reproduce, but I know @tobiasKaminsky can on his phone, so please do.

mario · 2017-08-31T10:40:04Z

Oh and it might help with #1450

mario · 2017-08-31T19:32:00Z

@AndyScherzinger we talked about merges/rebases without asking :P

AndyScherzinger · 2017-09-01T07:48:27Z

we talked about merges/rebases without asking :P

Thought that is about rebase, well than I'll also stop doing it for merged :)

AndyScherzinger · 2017-09-01T07:53:21Z

@mario test is negative :( The actual state is broken... Tested with "only during charging", taking 3 pictures

This PR:
Queue (0B!)

"Uploaded" (55B!) --> no upload happened, nothing on the server, no log entries, no file, no activity written

Same done for master:

Issue (of course) on the master is that the timestamp is the upload time, not the file created/modified.

AndyScherzinger · 2017-09-01T07:55:32Z

@mario btw I fixed some lint issues to make the drone build happy...

mario · 2017-09-01T08:36:24Z

@AndyScherzinger thanks, will take a look.

AndyScherzinger · 2017-09-01T08:43:54Z

Sweet!sorry for not having better news from testing :(

mario · 2017-09-01T09:12:56Z

@AndyScherzinger if you can test once more (did an update) for both internal and SD card uploads, that would be sweet. I'll do more thorough testing once I'm back at my desk.

AndyScherzinger · 2017-09-01T10:24:46Z

Sorry to disappoint you but the behavior described before remains the same except that the very first image waiting for upload shows the correct size in the queue, anything else is 0B and after "upload everything is 55B (displayed) while still none gets uploaded.

AndyScherzinger · 2017-09-04T14:39:37Z

Now size gets hidden for queued/failed uploads 👍
Unfortunately all uploads simply fail with http status -1 and I don't see any further infos in the logcat :/

mario · 2017-09-04T14:40:54Z

o.O SD card or internal storage?

I tested this on a few phones, and it worked here :-/

AndyScherzinger · 2017-09-04T14:42:30Z

internal storage

...not saying it has something todo with the device since I has re-login issues with the server yesterday but they are gone today ?! So it might work just fine. Hoping that @tobiasKaminsky can have another look so we are sure it is just my server...

AndyScherzinger · 2017-09-04T15:57:01Z

@mario tested it again using @tobiasKaminsky's server instead of mine and I get the same error (fresh installation of the app on the phone - OP3T):

09-04 17:52:40.119 17845-20345/com.nextcloud.client E/UploadFileOperation: Upload of /storage/emulated/0/DCIM/Camera/IMG_20170904_175219.jpg to /InstantUpload/Camera/IMG_20170904_175219.jpg: Operation finished with HTTP status code -1 (fail)

AndyScherzinger · 2017-09-04T16:01:24Z

@mario just re-tested with master and there the files simply upload, no issues...

mario · 2017-09-04T16:06:25Z

But not for all use-cases :) Pushed improvements, can you try?

…

On Mon, Sep 4, 2017 at 6:01 PM, Andy Scherzinger ***@***.***> wrote: @mario <https://github.com/mario> just re-tested with master and there the files simply upload, no issues... — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1468 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAAWsl7DGaR9VIeiAZE06dTWyuQh-hO1ks5sfB7UgaJpZM4PIoaM> .

AndyScherzinger · 2017-09-04T16:28:32Z

unfortunately I'm afk again for today :/

enoch85 · 2017-09-04T20:49:12Z

If you can send me a test account with this PR included to daniel at techandme dot se I can test this PR with Huwaei P10 which produces the log spamming.

mario · 2017-09-04T20:53:44Z

@enoch85 you mean apk? :) Can do it tomorrow, sure...

enoch85 · 2017-09-05T05:02:59Z

@mario Yeah, even better actually. :)

tobiasKaminsky · 2017-09-05T06:23:28Z

I tried it with my emulator, android 7 as a very first test:
The file is recognized and somehow "uploaded".
For a very short moment it is also visible in the correct folder:

But the file is not on server (also checked on filesystem).

However it is shown as correctly uploaded:

In Logcat I did not see any error. Only this related:

09-05 08:17:38.522 7175-7588/com.nextcloud.client D/UploadsStorageManager: updateDataseUploadResult uploadResult: com.owncloud.android.lib.common.operations.RemoteOperationResult@6aa377c upload: com.owncloud.android.operations.UploadFileOperation@9499805
09-05 08:17:38.526 7175-7199/com.nextcloud.client D/Thumbnail: URI: https://10.0.2.2/nc/index.php/apps/files/api/v1/thumbnail/256/256/SofortUpload/Camera/2017/09/IMG_20170905_081736.jpg
09-05 08:17:38.533 7175-7199/com.nextcloud.client D/OwnCloudClient #4: REQUEST GET /nc/index.php/apps/files/api/v1/thumbnail/256/256/SofortUpload/Camera/2017/09/IMG_20170905_081736.jpg
09-05 08:17:38.533 7175-7588/com.nextcloud.client V/UploadsStorageManager: Updating /storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg with status:UPLOAD_SUCCEEDED and result:UPLOADED (old:/storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg status:UPLOAD_IN_PROGRESS result:-1)
09-05 08:17:38.535 7175-7588/com.nextcloud.client V/UploadsStorageManager: Updating /storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg with status=UPLOAD_SUCCEEDED
09-05 08:17:38.541 7175-7588/com.nextcloud.client D/UploadsStorageManager: updateUpload returns with: 1 for file: /storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg

mario · 2017-09-05T06:25:52Z

What emulator, so i can see if I can replicate?

…

On Tue, 5 Sep 2017 at 08:23, Tobias Kaminsky ***@***.***> wrote: I tried it with my emulator, android 7 as a very first test: The file is recognized and somehow "uploaded". For a very short moment it is also visible in the correct folder: [image: 2017-09-05-081754] <https://user-images.githubusercontent.com/5836855/30047779-3263d448-9213-11e7-9a0e-5c68e881103e.png> But the file is not on server (also checked on filesystem). However it is shown as correctly uploaded: [image: 2017-09-05-082230] <https://user-images.githubusercontent.com/5836855/30047816-6011ce86-9213-11e7-902f-578479acb214.png> In Logcat I did not see any error. Only this related: 09-05 08:17:38.522 7175-7588/com.nextcloud.client D/UploadsStorageManager: updateDataseUploadResult uploadResult: ***@***.*** upload: ***@***.*** 09-05 08:17:38.526 7175-7199/com.nextcloud.client D/Thumbnail: URI: https://10.0.2.2/nc/index.php/apps/files/api/v1/thumbnail/256/256/SofortUpload/Camera/2017/09/IMG_20170905_081736.jpg 09-05 08:17:38.533 7175-7199/com.nextcloud.client D/OwnCloudClient #4: REQUEST GET /nc/index.php/apps/files/api/v1/thumbnail/256/256/SofortUpload/Camera/2017/09/IMG_20170905_081736.jpg 09-05 08:17:38.533 7175-7588/com.nextcloud.client V/UploadsStorageManager: Updating /storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg with status:UPLOAD_SUCCEEDED and result:UPLOADED (old:/storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg status:UPLOAD_IN_PROGRESS result:-1) 09-05 08:17:38.535 7175-7588/com.nextcloud.client V/UploadsStorageManager: Updating /storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg with status=UPLOAD_SUCCEEDED 09-05 08:17:38.541 7175-7588/com.nextcloud.client D/UploadsStorageManager: updateUpload returns with: 1 for file: /storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1468 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAAWsi7ze9dSLU1byIG9t6f97pMLZWHgks5sfOjggaJpZM4PIoaM> .

tobiasKaminsky · 2017-09-05T06:35:48Z

API 24

mario · 2017-09-05T06:37:33Z

Ok. Never seen this behaviour

…

On Tue, 5 Sep 2017 at 08:35, Tobias Kaminsky ***@***.***> wrote: API 24 — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1468 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAAWsnUdpdTj_y4v8xZuZYNScXF7Ultsks5sfOvFgaJpZM4PIoaM> .

mario · 2017-09-05T09:17:47Z

@AndyScherzinger @tobiasKaminsky please try again. @tobiasKaminsky please try with the phone where you have 0 byte files :)

Signed-off-by: Mario Danic <mario@lovelyhq.com>

…ip ci]

Signed-off-by: Mario Danic <mario@lovelyhq.com>

…ip ci]

…load file modification date

AndyScherzinger · 2017-09-06T07:28:08Z

@mario @tobiasKaminsky rebased and merged 💃

mario added this to the Nextcloud App 2.0.0 milestone Aug 31, 2017

mario requested review from AndyScherzinger and tobiasKaminsky August 31, 2017 10:28

mario added the 3. to review label Aug 31, 2017

mario mentioned this pull request Aug 31, 2017

Use proper sizing nextcloud/android-library#81

Closed

tobiasKaminsky mentioned this pull request Sep 1, 2017

Release 2.0.0RC6 #1473

Merged

mario and others added 25 commits September 6, 2017 09:19

Update locking code

910b038

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Try to get correct size

ccdfdaf

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Use new size variable

e08bda5

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Fix sizing

f106872

Signed-off-by: Mario Danic <mario@lovelyhq.com>

lint: Using dp instead of sp for text sizes

1aa0767

Drone: update Lint results to reflect reduced error/warning count [sk…

1ceb054

…ip ci]

Restore size

ffc6187

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Improve

013566a

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Fix

6e309a6

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Fix local uploads

a0294b7

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Fix service

3e914da

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Try to fix

0e0a6ac

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Set failed locking

9887e0f

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Check if upload operation is null

3c10dfe

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Fix coloring

b3a3d25

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Fix empty notification

913e865

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Simplify

3539413

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Store size before going anywhere

f87827c

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Fix

bad8fd9

Signed-off-by: Mario Danic <mario@lovelyhq.com>

replace ... with …

040ef3f

cleanup gradle settings

ae3035f

codacy: remove unused variable

96372f4

Use old lib

b353fb2

Signed-off-by: Mario Danic <mario@lovelyhq.com>

Drone: update Lint results to reflect reduced error/warning count [sk…

d5333eb

…ip ci]

bump to com.github.nextcloud:android-library:1.0.28 fixing chunked up…

761c9f8

…load file modification date

AndyScherzinger force-pushed the ao-improvements branch from 73f38c7 to 761c9f8 Compare September 6, 2017 07:19

AndyScherzinger merged commit a65e0f4 into master Sep 6, 2017

AndyScherzinger deleted the ao-improvements branch September 6, 2017 07:27

AndyScherzinger removed the 3. to review label Sep 6, 2017

Uh oh!

Uh oh!

Conversation

mario commented Aug 31, 2017 • edited by AndyScherzinger Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mario commented Aug 31, 2017

Uh oh!

mario commented Aug 31, 2017

Uh oh!

AndyScherzinger commented Sep 1, 2017

Uh oh!

AndyScherzinger commented Sep 1, 2017

Uh oh!

AndyScherzinger commented Sep 1, 2017

Uh oh!

mario commented Sep 1, 2017

Uh oh!

AndyScherzinger commented Sep 1, 2017

Uh oh!

mario commented Sep 1, 2017

Uh oh!

AndyScherzinger commented Sep 1, 2017

Uh oh!

AndyScherzinger commented Sep 4, 2017

Uh oh!

mario commented Sep 4, 2017

Uh oh!

AndyScherzinger commented Sep 4, 2017

Uh oh!

AndyScherzinger commented Sep 4, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AndyScherzinger commented Sep 4, 2017

Uh oh!

mario commented Sep 4, 2017 via email

Uh oh!

AndyScherzinger commented Sep 4, 2017

Uh oh!

enoch85 commented Sep 4, 2017

Uh oh!

mario commented Sep 4, 2017

Uh oh!

enoch85 commented Sep 5, 2017

Uh oh!

tobiasKaminsky commented Sep 5, 2017

Uh oh!

mario commented Sep 5, 2017 via email

Uh oh!

tobiasKaminsky commented Sep 5, 2017

Uh oh!

mario commented Sep 5, 2017 via email

Uh oh!

mario commented Sep 5, 2017

Uh oh!

AndyScherzinger commented Sep 6, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mario commented Aug 31, 2017 •

edited by AndyScherzinger

Loading

AndyScherzinger commented Sep 4, 2017 •

edited

Loading